Changelog fix

diff --git a/ChangeLog b/ChangeLog
index 25444e512ea598bb87a86eabf35f918f925c31b6..5be1053849386ae4365053263dac6e73192e473c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org>
        it; --libs strips out redundant -L<path>'s properly (there was
        code in there to do it before, but it didn't work)
 
->>>>>>> 1.528
 Thu Jul 16 18:24:41 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtknotebook.h: 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 25444e512ea598bb87a86eabf35f918f925c31b6..5be1053849386ae4365053263dac6e73192e473c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org>
        it; --libs strips out redundant -L<path>'s properly (there was
        code in there to do it before, but it didn't work)
 
->>>>>>> 1.528
 Thu Jul 16 18:24:41 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtknotebook.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 25444e512ea598bb87a86eabf35f918f925c31b6..5be1053849386ae4365053263dac6e73192e473c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org>
        it; --libs strips out redundant -L<path>'s properly (there was
        code in there to do it before, but it didn't work)
 
->>>>>>> 1.528
 Thu Jul 16 18:24:41 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtknotebook.h: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 25444e512ea598bb87a86eabf35f918f925c31b6..5be1053849386ae4365053263dac6e73192e473c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org>
        it; --libs strips out redundant -L<path>'s properly (there was
        code in there to do it before, but it didn't work)
 
->>>>>>> 1.528
 Thu Jul 16 18:24:41 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtknotebook.h: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 25444e512ea598bb87a86eabf35f918f925c31b6..5be1053849386ae4365053263dac6e73192e473c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org>
        it; --libs strips out redundant -L<path>'s properly (there was
        code in there to do it before, but it didn't work)
 
->>>>>>> 1.528
 Thu Jul 16 18:24:41 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtknotebook.h: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 25444e512ea598bb87a86eabf35f918f925c31b6..5be1053849386ae4365053263dac6e73192e473c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org>
        it; --libs strips out redundant -L<path>'s properly (there was
        code in there to do it before, but it didn't work)
 
->>>>>>> 1.528
 Thu Jul 16 18:24:41 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtknotebook.h: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 25444e512ea598bb87a86eabf35f918f925c31b6..5be1053849386ae4365053263dac6e73192e473c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org>
        it; --libs strips out redundant -L<path>'s properly (there was
        code in there to do it before, but it didn't work)
 
->>>>>>> 1.528
 Thu Jul 16 18:24:41 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtknotebook.h: